From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 15 Mar 1993 06:02:29 +0000 (+0000)
Subject: (PRINTPREPARE): Handle marker that points nowhere.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~96867
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cdaa87fd065ddd2431ce9ff21c5b9de4f4b6419b;p=emacs.git

(PRINTPREPARE): Handle marker that points nowhere.
---

diff --git a/src/print.c b/src/print.c
index a43a774c0f4..ba41e46454e 100644
--- a/src/print.c
+++ b/src/print.c
@@ -141,26 +141,30 @@ glyph_to_str_cpy (glyphs, str)
    Lisp_Object original;
 */ 
 
-#define PRINTPREPARE \
-   original = printcharfun; \
-   if (NILP (printcharfun)) printcharfun = Qt; \
-   if (XTYPE (printcharfun) == Lisp_Buffer) \
-     { if (XBUFFER (printcharfun) != current_buffer) Fset_buffer (printcharfun); \
-       printcharfun = Qnil;}\
-   if (XTYPE (printcharfun) == Lisp_Marker) \
-     { if (XMARKER (original)->buffer != current_buffer) \
-         set_buffer_internal (XMARKER (original)->buffer); \
-       old_point = point; \
-       SET_PT (marker_position (printcharfun)); \
-       start_point = point; \
+#define PRINTPREPARE						\
+   original = printcharfun;					\
+   if (NILP (printcharfun)) printcharfun = Qt;			\
+   if (XTYPE (printcharfun) == Lisp_Buffer)			\
+     { if (XBUFFER (printcharfun) != current_buffer)		\
+	 Fset_buffer (printcharfun);				\
+       printcharfun = Qnil;}					\
+   if (XTYPE (printcharfun) == Lisp_Marker)			\
+     { if (!(XMARKER (original)->buffer))			\
+         error ("Marker does not point anywhere");		\
+       if (XMARKER (original)->buffer != current_buffer)	\
+         set_buffer_internal (XMARKER (original)->buffer);	\
+       old_point = point;					\
+       SET_PT (marker_position (printcharfun));			\
+       start_point = point;					\
        printcharfun = Qnil;}
 
-#define PRINTFINISH \
-   if (XTYPE (original) == Lisp_Marker) \
-     Fset_marker (original, make_number (point), Qnil); \
-   if (old_point >= 0) \
-     SET_PT ((old_point >= start_point ? point - start_point : 0) + old_point); \
-   if (old != current_buffer) \
+#define PRINTFINISH					\
+   if (XTYPE (original) == Lisp_Marker)			\
+     Fset_marker (original, make_number (point), Qnil);	\
+   if (old_point >= 0)					\
+     SET_PT (old_point + (old_point >= start_point	\
+			  ? point - start_point : 0));	\
+   if (old != current_buffer)				\
      set_buffer_internal (old)
 
 #define PRINTCHAR(ch) printchar (ch, printcharfun)